$OpenBSD: patch-build_toolchain_gcc_toolchain_gni,v 1.5 2017/04/28 14:21:00 robert Exp $
--- build/toolchain/gcc_toolchain.gni.orig.port	Wed Apr 19 21:06:28 2017
+++ build/toolchain/gcc_toolchain.gni	Thu Apr 27 19:55:58 2017
@@ -12,6 +12,11 @@ import("//build/toolchain/clang_static_analyzer.gni")
 import("//build/toolchain/goma.gni")
 import("//build/toolchain/toolchain.gni")
 
+declare_args() {
+  extra_cppflags = ""
+  extra_ldflags = ""
+}
+
 # This template defines a toolchain for something that works like gcc
 # (including clang).
 #
@@ -280,7 +285,7 @@ template("gcc_toolchain") {
       # POSIX-like toolchains such as NaCl on Windows).
       ar_wrapper =
           rebase_path("//build/toolchain/gcc_ar_wrapper.py", root_build_dir)
-      command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" {{arflags}} rcsD @\"$rspfile\""
+      command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" {{arflags}} rcs @\"$rspfile\""
       description = "AR {{output}}"
       rspfile_content = "{{inputs}}"
       outputs = [
@@ -483,7 +488,7 @@ template("clang_toolchain") {
   }
 
   gcc_toolchain(target_name) {
-    prefix = rebase_path("$clang_base_path/bin", root_build_dir)
+    prefix = "/usr/local/bin"
     cc = "$prefix/clang"
     cxx = "$prefix/clang++"
     ld = cxx
